481051
@@ -366,6 +366,7 @@
private HiveHookEventProto getPreHookEvent(HookContext hookContext) {
       ApplicationId llapId = determineLlapId(conf, executionMode);
       if (llapId != null) {
         addMapEntry(builder, OtherInfoType.LLAP_APP_ID, llapId.toString());
+        builder.setQueue(conf.get(HiveConf.ConfVars.LLAP_DAEMON_QUEUE_NAME.varname));
       }
 
       conf.stripHiddenConfigurations(conf);
@@ -391,7 +392,10 @@
private HiveHookEventProto getPostHookEvent(HookContext hookContext, boolean suc
         builder.setOperationId(hookContext.getOperationId());
       }
       addMapEntry(builder, OtherInfoType.STATUS, Boolean.toString(success));
-      JSONObject perfObj = new JSONObject(hookContext.getPerfLogger().getEndTimes());
+      JSONObject perfObj = new JSONObject();
+      for (String key : hookContext.getPerfLogger().getEndTimes().keySet()) {
+        perfObj.put(key, hookContext.getPerfLogger().getDuration(key));
+      }
       addMapEntry(builder, OtherInfoType.PERF, perfObj.toString());
 
       return builder.build();
